From 34db012c96442a482d630df09461f6ef53f38e70 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 17 May 2005 18:17:46 +0000 Subject: [PATCH] bitkeeper revision 1.1437 (428a354asmqlyMWB8fzDzH6eMgDLow) Ensure preempt_stop always loads %ebp with thread-info pointer. Signed-off-by: Keir Fraser --- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S index 897759b1a6..064be004e7 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/entry.S @@ -108,7 +108,8 @@ VM_MASK = 0x00020000 #define XEN_TEST_PENDING(reg) testb $0xFF,evtchn_upcall_pending(reg) #ifdef CONFIG_PREEMPT -#define preempt_stop XEN_BLOCK_EVENTS(%esi) +#define preempt_stop GET_THREAD_INFO(%ebp) ; \ + XEN_BLOCK_EVENTS(%esi) #else #define preempt_stop #define resume_kernel restore_all @@ -127,7 +128,7 @@ VM_MASK = 0x00020000 pushl %ebx; \ movl $(__USER_DS), %edx; \ movl %edx, %ds; \ - movl %edx, %es + movl %edx, %es; #define RESTORE_INT_REGS \ popl %ebx; \ -- 2.30.2